Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 19 Jun 2010 12:15:25 +0000 (12:15 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 19 Jun 2010 12:15:25 +0000 (12:15 +0000)

Trivial merge